ChangeLog merge fix

Yet another unlabelled backport.

diff --git a/src/ChangeLog b/src/ChangeLog
index ab5621b96645861c4268758b0e5fc4cccbabbf88..3260af49d112e99df711df72198b85dc811b68bc 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,9 +1,3 @@
-2014-10-03  Dmitry Antipov  <dmantipov@yandex.ru>
-
-       * font.c (font_list_entities): Do not add empty vector to font cache.
-       (font_matching_entity): Likewise.  If matching entity is found, insert
-       1-item vector with this entity instead of an entity itself (Bug#17125).
-
 2014-10-03  Eli Zaretskii  <eliz@gnu.org>
 
        * xdisp.c (move_it_by_lines): Call reseat_1 after moving the